Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let cleanup steps hold their own data #5194

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Nov 8, 2024

Description

Let the cleanup steps hold their own data, instead of sharing the superset of required things via a pointer to Config. This makes the code structure a bit cleaner, so it is clear which step needs which configuration data.

Use the containerd component in the containers cleanup step to start the managed containerd, instead of the previous ad hoc approach.

Also, remove a hardcoded value for k0s's run directory along the way.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

Signed-off-by: Tom Wieczorek <[email protected]>
Use the run dir from the config struct instead.

Signed-off-by: Tom Wieczorek <[email protected]>
So it's obvious which parts of the config it uses.

Signed-off-by: Tom Wieczorek <[email protected]>
So it's obvious which parts of the config it uses.

Signed-off-by: Tom Wieczorek <[email protected]>
Instead of its own bespoke way of setting up containerd.

Signed-off-by: Tom Wieczorek <[email protected]>
Now that the steps hold their onw data, the cleanup step creation can be
moved into the NewConfig function, and the Config struct only needs to
care about the step slice.

Signed-off-by: Tom Wieczorek <[email protected]>
Makes the code a bit clearer.

Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 force-pushed the separate-cleanup-steps-data branch from f22d164 to 3cfc6fd Compare November 29, 2024 12:41
@twz123 twz123 marked this pull request as ready for review November 29, 2024 19:28
@twz123 twz123 requested review from a team as code owners November 29, 2024 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant